hidpi_scale_at_192

Gbp-Pq: Name hidpi_scale_at_192.diff

diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
index 7f2793b2b7922d90e0f85c7a51c6b3d3adffe864..330ba79eba1b117d7c8e6a22aa0ceafba5433d29 100644 (file)
--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
@@ -753,7 +753,12 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation)
         m_sizeMillimeters = sizeInMillimeters(geometry.size(), m_virtualDesktop->dpi());
 
     qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4);
-    m_pixelDensity = qMax(1, qRound(dpi/96));
+    qreal rawFactor = dpi/96;
+    int roundedFactor = qFloor(rawFactor);
+    // Round up for .8 and higher. This favors "small UI" over "large UI".
+    if (rawFactor - roundedFactor >= 0.8)
+        roundedFactor = qCeil(rawFactor);
+    m_pixelDensity = qMax(1, roundedFactor);
     m_geometry = geometry;
     m_availableGeometry = geometry & m_virtualDesktop->workArea();
     QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry);